Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

File to show options that tell GNU indent to format code as we want. #8

Closed
wants to merge 6 commits into from
Closed

Conversation

tonycurtis
Copy link
Contributor

Emacs and GNU indent options to reformat source for us

@shamisp
Copy link
Contributor

shamisp commented Oct 30, 2014

Even better since it includes both emacs and GNU indent. There is no need resubmit #6.
Please rebase this one into single commit. I also rejected #7 (duplicated).

@shamisp
Copy link
Contributor

shamisp commented Oct 30, 2014

This is good document describing how to squash multiple commits.
http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html

@tonycurtis
Copy link
Contributor Author

So rebase in which branch? merge both emacs and indent branches into master and then create new pull request on that?

@shamisp
Copy link
Contributor

shamisp commented Oct 30, 2014

Not really. In the "indent" branch do git rebase -i HEAD~2
This should give you an option to squash these 3 commits into 1 commit.

Once you did it, you may push back to your branch with:
git push -f origin indent

Tony Curtis added 3 commits October 29, 2014 22:00
Remove license stub.

File to show options that tell GNU indent to format code as we want.

Use better namespace for functions - use ucx namespace rather than temp
"tc"
@yosefe
Copy link
Contributor

yosefe commented Oct 30, 2014

+1

@shamisp
Copy link
Contributor

shamisp commented Oct 31, 2014

@tonycurtis - it is waiting for you to squash it :)

@tonycurtis tonycurtis closed this Oct 31, 2014
@shamisp
Copy link
Contributor

shamisp commented Oct 31, 2014

There is no need to close it. If you need help I may squash it for you in your branch :)

@tonycurtis
Copy link
Contributor Author

On Oct 30, 2014, at 10:53 PM, Pasha <notifications@github.mirror.nvdadr.commailto:notifications@github.com> wrote:

@tonycurtishttps://github.com/tonycurtis - it is waiting for you to squash it :)

I thought I had…?

"This pull request is closed, but the tonycurtis:indent branch has unmerged commits.”

git-commit,-pull,-diff,-push shows nothing?

Don’t know what to do...

tony

@shamisp
Copy link
Contributor

shamisp commented Oct 31, 2014

This request was closed and replaced by #12

evgeny-leksikov pushed a commit to evgeny-leksikov/ucx that referenced this pull request Apr 28, 2020
TEST/APPS: Fix UCP request leak in case of unsuccessful ucp_stream_send_nb
gleon99 added a commit to gleon99/ucx that referenced this pull request Dec 13, 2020
# This is the 1st commit message:

UCS/DATASTRUCT: Add allow_list data struct

# The commit message openucx#2 will be skipped:

# add test

# The commit message openucx#3 will be skipped:

# use allow_list

# The commit message openucx#4 will be skipped:

# use allow_list

# The commit message openucx#5 will be skipped:

# Add allow_list mode

# The commit message openucx#6 will be skipped:

# Use separate funcs for allow_list

# The commit message openucx#7 will be skipped:

# implement scanf, release, print

# The commit message openucx#8 will be skipped:

# implement clone

# The commit message openucx#9 will be skipped:

# tests

# The commit message openucx#10 will be skipped:

# Add test; Fix ^

# The commit message openucx#11 will be skipped:

# Add test
@raychen911 raychen911 mentioned this pull request Jan 7, 2021
shizhibao pushed a commit to shizhibao/ucx that referenced this pull request Jan 16, 2021
fix ucg_builtin_step_select_callbacks
dmitrygx pushed a commit to dmitrygx/ucx that referenced this pull request Dec 1, 2021
edgargabriel pushed a commit to edgargabriel/ucx that referenced this pull request May 25, 2022
andypauloramirez added a commit to andypauloramirez/ucx-APR that referenced this pull request Aug 16, 2022
@skypexu skypexu mentioned this pull request Aug 26, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Duplicate Invalid The issue will be ignored
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants